From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun, 24 Jun 2012 19:02:46 +0000 (-0400)
Subject: tests: Don't use the default stage
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6421
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0d82ce521053b186c712784438b66d336f65a3e9;p=gnome-shell.git

tests: Don't use the default stage

https://bugzilla.gnome.org/show_bug.cgi?id=678737
---

diff --git a/tests/interactive/background-size.js b/tests/interactive/background-size.js
index e5e56f878..72112fa91 100644
--- a/tests/interactive/background-size.js
+++ b/tests/interactive/background-size.js
@@ -6,11 +6,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.user_resizable = true;
-stage.width = 1024;
-stage.height = 768;
+let stage = new Clutter.Stage({ user_resizable: true, width: 1024, height: 768 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ style: 'background: #ffee88;' });
 vbox.add_constraint(new Clutter.BindConstraint({ source: stage,
diff --git a/tests/interactive/border-radius.js b/tests/interactive/border-radius.js
index d3ab718bf..1cd3d04cb 100644
--- a/tests/interactive/border-radius.js
+++ b/tests/interactive/border-radius.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,
diff --git a/tests/interactive/border-width.js b/tests/interactive/border-width.js
index 988166c09..e575a2f40 100644
--- a/tests/interactive/border-width.js
+++ b/tests/interactive/border-width.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,
diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index d5253d641..88825ed22 100644
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,
diff --git a/tests/interactive/box-layout.js b/tests/interactive/box-layout.js
index 8d3882682..9e9b21123 100644
--- a/tests/interactive/box-layout.js
+++ b/tests/interactive/box-layout.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,
diff --git a/tests/interactive/box-shadows.js b/tests/interactive/box-shadows.js
index a1ae5681d..42ed685f7 100644
--- a/tests/interactive/box-shadows.js
+++ b/tests/interactive/box-shadows.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,
diff --git a/tests/interactive/calendar.js b/tests/interactive/calendar.js
index 0f041995e..a181aa891 100644
--- a/tests/interactive/calendar.js
+++ b/tests/interactive/calendar.js
@@ -7,10 +7,8 @@ const St = imports.gi.St;
 const Calendar = imports.ui.calendar;
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = stage.height = 400;
-stage.show();
+let stage = new Clutter.Stage({ width: 400, height: 400 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,
diff --git a/tests/interactive/css-fonts.js b/tests/interactive/css-fonts.js
index 6dcec50dc..d23396e5e 100644
--- a/tests/interactive/css-fonts.js
+++ b/tests/interactive/css-fonts.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let b = new St.BoxLayout({ vertical: true,
                            width: stage.width,
diff --git a/tests/interactive/entry.js b/tests/interactive/entry.js
index ed4b5bd77..852aa99c1 100644
--- a/tests/interactive/entry.js
+++ b/tests/interactive/entry.js
@@ -1,19 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const UI = imports.testcommon.ui;
 
-Gtk.init(null, null);
-
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = stage.height = 400;
-stage.show();
+let stage = new Clutter.Stage({ width: 400, height: 400 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,
diff --git a/tests/interactive/icons.js b/tests/interactive/icons.js
index 25d1dfc09..f6b8d4a8e 100644
--- a/tests/interactive/icons.js
+++ b/tests/interactive/icons.js
@@ -5,11 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-
-stage.width = 400;
-stage.height = 700;
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let b = new St.BoxLayout({ vertical: true,
                            width: stage.width,
diff --git a/tests/interactive/inline-style.js b/tests/interactive/inline-style.js
index c9cf9c72c..e8e533aea 100644
--- a/tests/interactive/inline-style.js
+++ b/tests/interactive/inline-style.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,
diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js
index 1f795b70b..7ccd6d88a 100644
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@@ -251,10 +251,8 @@ SizingIllustrator.prototype = {
 
 /****************************************************************************/
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 600;
-stage.height = 600;
+let stage = new Clutter.Stage({ width: 600, height: 600 });
+UI.init(stage);
 
 let mainBox = new St.BoxLayout({ width: stage.width,
 				 height: stage.height,
diff --git a/tests/interactive/scrolling.js b/tests/interactive/scrolling.js
index e03a4edcf..3050f579d 100644
--- a/tests/interactive/scrolling.js
+++ b/tests/interactive/scrolling.js
@@ -6,8 +6,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,
diff --git a/tests/interactive/table.js b/tests/interactive/table.js
index 31771db9c..b0ba36989 100644
--- a/tests/interactive/table.js
+++ b/tests/interactive/table.js
@@ -5,9 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = stage.height = 600;
+let stage = new Clutter.Stage({ width: 600, height: 600 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,
diff --git a/tests/interactive/transitions.js b/tests/interactive/transitions.js
index 040924591..ec6fc8185 100644
--- a/tests/interactive/transitions.js
+++ b/tests/interactive/transitions.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let hbox = new St.BoxLayout({ name: 'transition-container',
                               reactive: true,
diff --git a/tests/testcommon/ui.js b/tests/testcommon/ui.js
index 56a8aeccd..bc88db8d8 100644
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@@ -3,16 +3,13 @@
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Environment = imports.ui.environment;
 
-function init() {
+function init(stage) {
     Environment.init();
-
-    let stage = Clutter.Stage.get_default();
-    let context = St.ThemeContext.get_for_stage (stage);
+    let context = St.ThemeContext.get_for_stage(stage);
     let stylesheetPath = GLib.getenv("GNOME_SHELL_TESTSDIR") + "/testcommon/test.css";
-    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
-    context.set_theme (theme);
+    let theme = new St.Theme({ application_stylesheet: stylesheetPath });
+    context.set_theme(theme);
 }